Deprecate unused cryptohome functions BUG=chromium-os:16552 TEST=gmerge libcros Change-Id: I42de2390f84ff2fc4abd8a74c050fd1223d8d434 Reviewed-on: https://gerrit.chromium.org/gerrit/15310 Commit-Ready: Ryo Hashimoto <hashimoto@chromium.org> Tested-by: Ryo Hashimoto <hashimoto@chromium.org> Reviewed-by: Satoru Takabayashi <satorux@chromium.org>
diff --git a/chromeos_cros_api.h b/chromeos_cros_api.h index 70605cb..8a5edc6 100644 --- a/chromeos_cros_api.h +++ b/chromeos_cros_api.h
@@ -350,12 +350,14 @@ // CryptohomeMountAllowFail, CryptohomeMountGuest, CryptohomeUnmount, // CryptohomeAsyncDoAutomaticFreeDiskSpaceControl, // CryptohomeInstallAttributesCount, CryptohomeInstallAttributesIsSecure. +// 195: Deprecated CryptohomePkcs11IsTmpTokenReadyForUser, +// CryptohomePkcs11GetTmpTokenReadyForUser, CryptohomeGetStatusString. namespace chromeos { // NOLINT enum CrosAPIVersion { kCrosAPIMinVersion = 191, - kCrosAPIVersion = 194 + kCrosAPIVersion = 195 }; // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so" diff --git a/chromeos_cryptohome.h b/chromeos_cryptohome.h index 523d5c4..43a801e 100644 --- a/chromeos_cryptohome.h +++ b/chromeos_cryptohome.h
@@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -56,11 +56,6 @@ extern void (*CryptohomePkcs11GetTpmTokenInfo)(std::string* label, std::string* user_pin); extern bool (*CryptohomePkcs11IsTpmTokenReady)(); -extern void (*CryptohomePkcs11GetTpmTokenInfoForUser)(const std::string& user, - std::string* label, - std::string* user_pin); -extern bool (*CryptohomePkcs11IsTpmTokenReadyForUser)(const std::string& user); -extern bool (*CryptohomeGetStatusString)(std::string* status); extern bool (*CryptohomeInstallAttributesGet)(const char* name, char** value); extern bool (*CryptohomeInstallAttributesSet)(const char* name, const char* value);
diff --git a/load.cc b/load.cc index 17ea97b..328e519 100644 --- a/load.cc +++ b/load.cc
@@ -191,10 +191,6 @@ DECL_FUNC_0(CryptohomeTpmClearStoredPassword, void); DECL_FUNC_0(CryptohomePkcs11IsTpmTokenReady, bool); DECL_FUNC_2(CryptohomePkcs11GetTpmTokenInfo, void, std::string*, std::string*); -DECL_FUNC_1(CryptohomePkcs11IsTpmTokenReadyForUser, bool, const std::string&); -DECL_FUNC_3(CryptohomePkcs11GetTpmTokenInfoForUser, void, const std::string&, - std::string*, std::string*); -DECL_FUNC_1(CryptohomeGetStatusString, bool, std::string*); DECL_FUNC_2(CryptohomeInstallAttributesGet, bool, const char*, char**); DECL_FUNC_2(CryptohomeInstallAttributesSet, bool, const char*, const char*); DECL_FUNC_0(CryptohomeInstallAttributesFinalize, bool); @@ -323,9 +319,6 @@ INIT_FUNC(CryptohomeTpmClearStoredPassword); INIT_FUNC(CryptohomePkcs11IsTpmTokenReady); INIT_FUNC(CryptohomePkcs11GetTpmTokenInfo); - INIT_FUNC(CryptohomePkcs11IsTpmTokenReadyForUser); - INIT_FUNC(CryptohomePkcs11GetTpmTokenInfoForUser); - INIT_FUNC(CryptohomeGetStatusString); INIT_FUNC(CryptohomeInstallAttributesGet); INIT_FUNC(CryptohomeInstallAttributesSet); INIT_FUNC(CryptohomeInstallAttributesFinalize);
